Preparing first candidate of package.

- deleting incorrect man pages.
- solving multiarch problems in tools package.

diff --git a/debian/control b/debian/control
index 0adef0a6597bbfbb8ed4cb1e012994b582de0daa..5d5079e6f41df495e5d5e836638823108dc4c49e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Thomas Moulard <thomas.moulard@gmail.com>,
           Leopold Palomo-Avellaneda <leo@alaxarxa.net>
 Section: libs
 Priority: extra
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9), dh-exec (>=0.3),
                cmake,
                doxygen,
                doxygen-latex,
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9),
               libqhull-dev,
               libgtest-dev,
               libopenni-dev,
-              libopenni-sensor-primesense-dev,
+              libopenni-sensor-pointclouds-dev,
               python-vtk,
               libqt4-opengl-dev,
               libusb-1.0-0-dev,
@@ -125,7 +125,8 @@ Description: Point Cloud Library - apps library
  filtering, feature estimation, surface reconstruction, registration, model
  fitting and segmentation.
  .
- This package contains the libraries needed to run applications depending on PCL apps.
+ This package contains the libraries needed to run applications depending 
+ on PCL apps.
 
 Package: libpcl-features1.7
 Architecture: any

diff --git a/debian/libpcl-doc.docs b/debian/libpcl-doc.docs
index a145875db02fd9633027153ca2fb576ef649eecc..aff12030d66d3d9a8f4f5b5252c98fa27b6ab10c 100644 (file)
--- a/debian/libpcl-doc.docs
+++ b/debian/libpcl-doc.docs
@@ -1,2 +1 @@
-*/doc/doxygen/html/
-usr/share/doc/pcl-1.7/tutorials/sources/*
+*/doc/html/*

diff --git a/debian/libpcl-tools.install b/debian/libpcl-tools.install
old mode 100644 (file)
new mode 100755 (executable)
index ce587c7..a46f939
--- a/debian/libpcl-tools.install
+++ b/debian/libpcl-tools.install
@@ -1 +1,3 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libpcl_cc_* usr/lib/cloud_composer_plugins
 usr/bin/pcl_*

diff --git a/debian/libpcl-tools.manpages b/debian/libpcl-tools.manpages
index fae184edfdb58246b335a870f104db5827c63da0..7e9b7504972344cfdc2d4374edcb02233205ac23 100644 (file)
--- a/debian/libpcl-tools.manpages
+++ b/debian/libpcl-tools.manpages
@@ -1,8 +1,3 @@
-debian/manpages/openni_fast_mesh.1
-debian/manpages/openni_ii_normal_estimation.1
-debian/manpages/openni_image.1
-debian/manpages/openni_viewer.1
-debian/manpages/openni_voxel_grid.1
 debian/manpages/pcd_grabber_viewer.1
 debian/manpages/pcd_viewer.1
 debian/manpages/pcl_add_gaussian_noise.1
@@ -14,7 +9,6 @@ debian/manpages/pcl_convert_pcd_ascii_binary.1
 debian/manpages/pcl_convolve.1
 debian/manpages/pcl_crop_to_hull.1
 debian/manpages/pcl_demean_cloud.1
-debian/manpages/pcl_elch.1
 debian/manpages/pcl_extract_feature.1
 debian/manpages/pcl_fast_bilateral_filter.1
 debian/manpages/pcl_feature_matching.1
@@ -82,7 +76,6 @@ debian/manpages/pcl_ply2vtk.1
 debian/manpages/pcl_plyheader.1
 debian/manpages/pcl_png2pcd.1
 debian/manpages/pcl_pointclouds.1
-debian/manpages/pcl_pointclouds.1~
 debian/manpages/pcl_poisson_reconstruction.1
 debian/manpages/pcl_ppf_object_recognition.1
 debian/manpages/pcl_sac_segmentation_plane.1

diff --git a/debian/manpages/openni_fast_mesh.1 b/debian/manpages/openni_fast_mesh.1
deleted file mode 100644 (file)
index 7dd8c8e..0000000
--- a/debian/manpages/openni_fast_mesh.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH PCL 1
-
-.SH NAME
-
-FIXME \- FIXME
-
-.SH SYNOPSIS
-
-.B FIXME [OPTIONS]
-
-.SH DESCRIPTION
-
-FIXME
-
-.SH OPTIONS
-
-FIXME
-
-.SH SEE ALSO
-
-.TP
-.B Home Page
-http://www.pointclouds.org/
-
-.SH AUTHOR
-
-Willow Garage, Inc. and Open Perception, Inc.

diff --git a/debian/manpages/openni_ii_normal_estimation.1 b/debian/manpages/openni_ii_normal_estimation.1
deleted file mode 100644 (file)
index 7dd8c8e..0000000
--- a/debian/manpages/openni_ii_normal_estimation.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH PCL 1
-
-.SH NAME
-
-FIXME \- FIXME
-
-.SH SYNOPSIS
-
-.B FIXME [OPTIONS]
-
-.SH DESCRIPTION
-
-FIXME
-
-.SH OPTIONS
-
-FIXME
-
-.SH SEE ALSO
-
-.TP
-.B Home Page
-http://www.pointclouds.org/
-
-.SH AUTHOR
-
-Willow Garage, Inc. and Open Perception, Inc.

diff --git a/debian/manpages/openni_image.1 b/debian/manpages/openni_image.1
deleted file mode 100644 (file)
index 7dd8c8e..0000000
--- a/debian/manpages/openni_image.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH PCL 1
-
-.SH NAME
-
-FIXME \- FIXME
-
-.SH SYNOPSIS
-
-.B FIXME [OPTIONS]
-
-.SH DESCRIPTION
-
-FIXME
-
-.SH OPTIONS
-
-FIXME
-
-.SH SEE ALSO
-
-.TP
-.B Home Page
-http://www.pointclouds.org/
-
-.SH AUTHOR
-
-Willow Garage, Inc. and Open Perception, Inc.

diff --git a/debian/manpages/openni_viewer.1 b/debian/manpages/openni_viewer.1
deleted file mode 100644 (file)
index 7dd8c8e..0000000
--- a/debian/manpages/openni_viewer.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH PCL 1
-
-.SH NAME
-
-FIXME \- FIXME
-
-.SH SYNOPSIS
-
-.B FIXME [OPTIONS]
-
-.SH DESCRIPTION
-
-FIXME
-
-.SH OPTIONS
-
-FIXME
-
-.SH SEE ALSO
-
-.TP
-.B Home Page
-http://www.pointclouds.org/
-
-.SH AUTHOR
-
-Willow Garage, Inc. and Open Perception, Inc.

diff --git a/debian/manpages/openni_voxel_grid.1 b/debian/manpages/openni_voxel_grid.1
deleted file mode 100644 (file)
index 7dd8c8e..0000000
--- a/debian/manpages/openni_voxel_grid.1
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH PCL 1
-
-.SH NAME
-
-FIXME \- FIXME
-
-.SH SYNOPSIS
-
-.B FIXME [OPTIONS]
-
-.SH DESCRIPTION
-
-FIXME
-
-.SH OPTIONS
-
-FIXME
-
-.SH SEE ALSO
-
-.TP
-.B Home Page
-http://www.pointclouds.org/
-
-.SH AUTHOR
-
-Willow Garage, Inc. and Open Perception, Inc.

diff --git a/debian/manpages/pcl_elch.1 b/debian/manpages/pcl_elch.1
deleted file mode 100644 (file)
index dc074e6..0000000
--- a/debian/manpages/pcl_elch.1
+++ /dev/null
@@ -1,10 +0,0 @@
-.SH AUTHOR
-pcl_elch is part of Point Cloud Library (PCL) - www.pointclouds.org
-
-The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D
-image and point cloud processing.
-.PP
-This manual page was written by Leopold Palomo-Avellaneda <leo@alaxarxa.net> with
-the help of help2man tool and some handmade arrangement for the Debian project
-(and may be used by others).
-

diff --git a/debian/manpages/pcl_obj_rec_ransac_orr_octree.1 b/debian/manpages/pcl_obj_rec_ransac_orr_octree.1
index 24dac78085b2742326d9fb0e846e605873ecb4d7..b8d6f550ff0ba60b8ea2db20b122ee2e2ccfb680 100644 (file)
--- a/debian/manpages/pcl_obj_rec_ransac_orr_octree.1
+++ b/debian/manpages/pcl_obj_rec_ransac_orr_octree.1
@@ -3,10 +3,10 @@
 .SH NAME
 pcl_obj_rec_ransac_orr_octree \- pcl_obj_rec_ransac_orr_octree
 .SH DESCRIPTION
-Syntax is ./pcl_obj_rec_ransac_orr_octree <vtk file> <leaf_size>
+Syntax is pcl_obj_rec_ransac_orr_octree <vtk file> <leaf_size>
 
-EXAMPLE:
-./pcl_obj_rec_ransac_orr_octree ../../test/tum_rabbit.vtk 6
+.SH EXAMPLE:
+pcl_obj_rec_ransac_orr_octree ../../test/tum_rabbit.vtk 6
 
 .SH AUTHOR
 pcl_obj_rec_ransac_orr_octree is part of Point Cloud Library (PCL) - www.pointclouds.org

diff --git a/debian/rules b/debian/rules
index 4fcc2d4a1dec723f462a66d2d93bef37c4737419..b2bd980d2db7370892b3efb404b4b49471643413 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,7 @@ CXXFLAGS+=$(CPPFLAGS)
 # Multiarch.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-.PHONY: override_dh_auto_configure override_dh_auto_build override_dh_strip
-
+.PHONY: override_dh_auto_configure override_dh_auto_build override_dh_strip override_dh_install
 
 override_dh_auto_configure:
        dh_auto_configure --                                            \
@@ -37,9 +36,9 @@ override_dh_auto_build:
 
 override_dh_install:
        mkdir -p debian/tmp/usr/share/doc/libpcl1.7-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/libpcl1.7-dbg/
-       dh_install --list-missing
        
-       @for i in pcl_cloud_composer pcl_concatenate_points_pcd pcl_dinast_grabber \
+       for i in pcl_cloud_composer pcl_concatenate_points_pcd \
+               pcl_elch pcl_dinast_grabber pcl_hdl_grabber \
                pcl_icp pcl_icp2d pcl_lum pcl_manual_registration pcl_match_linemod_template \
                pcl_multiscale_feature_persistence_example pcl_ndt2d pcl_ndt3d pcl_ni_agast \
                pcl_ni_linemod pcl_ni_susan pcl_nn_classification_example \
@@ -55,9 +54,10 @@ override_dh_install:
                pcl_registration_visualizer pcl_surfel_smoothing_test \
                pcl_timed_trigger_test pcl_viewer pcl_virtual_scanner \
                pcl_voxel_grid_occlusion_estimation; do \
-       cmd="dh_link -p libpcl_tools usr/share/man/man1/pcl_pointclouds.1 usr/share/man/man1/$$i.1"; \
+       cmd="dh_link -p libpcl-tools usr/share/man/man1/pcl_pointclouds.1 usr/share/man/man1/$$i.1"; \
        echo $$cmd; $$cmd; \
        done
+       dh_install --list-missing
 
 override_dh_strip:
        dh_strip -a --dbg-package=libpcl1.7-dbg